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: 8d4213d2

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



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