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: aff5d33b am: 197243d1

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



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