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

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

Change-Id: I26e683f26989eb33e9ec4c91e45d8219e345eac2