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: 15fbceb2 am: 7d79cae1 am: 02411d54 am: 9436778d

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



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