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: 58a0f136

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



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