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

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



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