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

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

Change-Id: I4bbdb5252dcf1e73bdd0b05e382bb8a6482bd8df