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

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

Change-Id: Ia87c1aacd00a50d653b08c88a5d20b349bce2da8