Merge "Update language to comply with Android's inclusive language guidance" am: 97937ef8f2 am: fa47739ebe am: 2a9274cd2c am: e98479eb76 am: 9dae45838b

Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/1385922

Change-Id: I680cc43da8a4d19ac1f9bd8bf6b14489395bc223