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: 1b4b8990 am: f85f0e6b

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



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