[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: fc81e4d3 -s ours am: 0710b958 -s ours

am skip reason: Change-Id I915e09e4e64d5c268630cec2d0ef05ea0592fd6f with SHA-1 bde40af6 is in history

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

Change-Id: I65ab421b637ed3ea15e601c2014f0e38a9abc93c