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 am: 02411d54

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



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