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 am: 1b58f156

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



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