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 am: 888cb5b1

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



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