Merge "Update language to comply with Android's inclusive language guidance" am: b1f872ad71 am: 6bfd4b9907 am: 764b99146b

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

Change-Id: I2861ba33413457e16e40f79166e12903f2d76c75