Merge "Update language to comply with Android's inclusive language guidance" am: 7c61a35304 am: a771406f9e

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

Change-Id: Iaf5fadf609924aa5929dbf973970b216706f01d5