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

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



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