Use more inclusive terms. am: 697ce36c44 am: 8b712f7045

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

Change-Id: I55ea7032460fd52448feeaf840ba8698db3e2242