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: 6318d8ca am: 9af72609 am: b83d4c43

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



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