Merge "Merge "Update language to comply with Android's inclusive language...

Merge "Merge "Update language to comply with Android's inclusive language guidance" into main am: d57068d7 am: 407947e2 am: 33a9e91f" into udc-d1-dev-plus-aosp am: 0dbc9f74

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



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