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: 5db4dc6c am: fb3de263

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



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