[automerger skipped] Merge "Update language to comply with Android's inclusive...

[automerger skipped] Merge "Update language to comply with Android's inclusive language guidance" into rvc-d1-dev-plus-aosp am: 8dc88a6a am: 04ddd768 -s ours

am skip reason: Change-Id Ibbd97bf31915d59b5110cbcc8f2126f7a7221060 with SHA-1 cfb9bd34 is in history

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

Change-Id: I832f6080c85699bce11e7992d6bc51ddc5dadb83