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: 5908abd4 am: 168ac701 am: 5eed0177

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



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