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: a2d740da am: 294b2bfa

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



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