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 am: 38be1561 am: f14cf1af

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



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