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: 5e6c5c36 am: 31556d65 am: d35bba3a

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



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