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 am: 2e3274f3 am: 22f48a2b

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



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