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 am: 394e5b44

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



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