Merge "Update language to comply with Android's inclusive language guidance Test: m checkbuild" am: 9c9bafffe8 am: 8ca1bd9157 am: 896bdeb4dd

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

Change-Id: I3d49d65c827d0b15a86a0508d3442e6f478e25b7