Merge "Use more inclusive terms." into rvc-dev-plus-aosp am: 6da1a17423 am: e9d251bb1b

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

Change-Id: I4c7321bbb5fb716d835942d20582e9c7b72edd56