Merge "Update language to comply with Android's inclusive language guidance"...

Merge "Update language to comply with Android's inclusive language guidance" into main am: 8f549d82

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



Change-Id: Iae48722bebd7f963acb5d2bdd98adb2c0e85fbfe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>