Merge "Use more inclusive terms." into rvc-dev-plus-aosp am: 094c85c9 am:...

Merge "Use more inclusive terms." into rvc-dev-plus-aosp am: 094c85c9 am: 8d7604a4 am: a5220103

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

Change-Id: I389a17b987a5a3bc40e2ecc70f348f4cec045245