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

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



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