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: ff3d778f am: da639353 am: 9a84206d

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



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