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

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



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