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: 5842fcf9

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



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