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: d9546e93 am: 63c32977

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



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