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

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



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