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 am: 908438e7

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



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