Merge "Update language to comply with Android's inclusive language guidance" am: f01d4b506e

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

Change-Id: I08134a44d56728e6240f78ec28688bebf281a2d2