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: d57068d7 am: 407947e2

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



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