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: 5908abd4 am: 168ac701

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



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