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: 15fbceb2 am: 7d79cae1

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



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