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: fabdb43a

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



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