Merge "Update language to comply with Android's inclusive language guidance" am: 6ddb72eef7 am: 1c4b3690ee

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

Change-Id: I461a7663e9be1f70f11931155917badfedc5f663