Merge "Update language to comply with Android's inclusive language guidance" am: 4786a87b63 am: a19f43a1ac

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

Change-Id: Idf30bcb2c00ec3fd13f8c327757bd2818698b307