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: d259fb38

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



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