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: 912fb314

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



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