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: 6318d8ca

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



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