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: 8d4213d2 am: cdd61018 am: 5eacce44

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



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