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: 6f075fb8 am: 511bf6bb

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



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