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: 8b3dfbf7 am: 7d948f2f

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



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