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

Merge "Use more inclusive terms." into rvc-dev-plus-aosp am: 6da1a174 am: e9d251bb am: 2658bbf0

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

Change-Id: Ia9a0fea92cd55fe513b4f94ff440fb748e62dbca