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: 912fb314 am: 884d2cca am: 33aaa056

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



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