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: 5e6c5c36

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



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