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

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



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