Use more inclusive terms. am: 697ce36c44 am: 8b712f7045 am: 6848641a68 am: 32377d64e4

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

Change-Id: I5c0a071cdffbcd53a199fc15e59641623b665b5b