Merge "Update language to comply with Android's inclusive language guidance" am: 785728770d am: 13ec568144 am: d0a6433acb am: 0600d18f66 am: dcc5cfbaf0

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

Change-Id: I50247400e315d8070775627ec981c7f93d9bdd30