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: 4af01706

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



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