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 am: 197243d1 am: 7a0d6ba5 am: 95476f67

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



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