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: ff3d778f am: da639353

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



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