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: 5842fcf9 am: 84ea9c5e

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



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