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

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

Change-Id: I5c6b964d4004faa702ebc756bf49e5d1f99e0169