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: eb1ddf02

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



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