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: eb1ddf02 am: 17c87a91 am: 684c1e66

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



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