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

[automerger skipped] Merge "Update language to comply with Android's inclusive language guidance" am: 267cc116 am: 711a4b4b -s ours am: 8ce269ef -s ours am: a50e74fc -s ours am: 89116517 -s ours

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

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

Change-Id: Ifbdcf87a2f88a4338d173ac243eb231948483839