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

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



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