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: ff3d778f

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



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