[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-dev-plus-aosp am: ee4e5355 am: 6a4d2124 am: 399e01a0 -s ours

am skip reason: skipped by user juliatuttle

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

Change-Id: Ib180014ff931c46ca7c32752b949d77b27cb275c