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: 9d3f99b0

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



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