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: 5e6c5c36 am: 31556d65

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



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