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: 04b22dd2 am: 8bdf4ec6

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2836225



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