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

Merge "[automerger skipped] Merge "Update language to comply with Android's inclusive language guidance" am: 56f5e659 am: e7b108a3 -s ours" into rvc-dev-plus-aosp am: 4f547ed3 -s ours am: da8928b7 -s ours

am skip reason: Change-Id I971050a2665c177870ff257bd0f41343db702892 with SHA-1 9d7ff99a is in history

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

Change-Id: Ib217f70780c55828d2705f856af135db53e87710