Merge "Update language to comply with Android's inclusive language guidance" am: 97937ef8f2 am: fa47739ebe am: 2a9274cd2c am: e98479eb76

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

Change-Id: I11e4c07fb17914f474d5ca5ab5c756b7e04d6d5c