Merge "Update language to comply with Android's inclusive language guidance" am: 0be1ec5c17

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

Change-Id: I0d5dc3a33486147db0ff950dcc2f6396ab216ad9