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: 912fb314 am: 884d2cca

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



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