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: e76260ed am: 3f5318c8

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



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