Merge "Update language to comply with Android's inclusive language guidance Test: m checkbuild" am: 9c9bafffe8 am: 8ca1bd9157

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

Change-Id: Icfb70c6bb8a75434f58a7f456e9fffe7c701aaf0