Merge "Update language to comply with Android's inclusive language guidance" am: b1f872ad71 am: 6bfd4b9907

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

Change-Id: Ief0873be6f7540f4b1c4e06eb0c375a5d9cf3237