Merge "Update language to comply with Android's inclusive language guidance" am: 8fd831a505 am: 1162c51b0c am: 86b249c78a am: e77ea9bcc9

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

Change-Id: Ie90ede02cf82b3d652d7bd95b845fe3e416d6775