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

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



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