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: 5908abd4

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



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