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

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

Change-Id: Ia17a2ba15af6e06d8fe987821d25c1815e868b4c