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: 6318d8ca am: 9af72609

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



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