[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 skip reason: Change-Id I499c4574464862f3a1dcea2c6d51813e23ba4b82 with SHA-1 8ea64c4b is in history

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

Change-Id: I865cede45f15bb2339e7cf3341caceff2991b8b4