Merge "Update language to comply with Android's inclusive language guidance"...

Merge "Update language to comply with Android's inclusive language guidance" am: cba7671e am: c5d0b788 am: 392da248 am: 955ac80c

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



Change-Id: I71f9b7d0d044659d02a3d9003288a91019cf460b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>