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

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

Change-Id: I675915193a1740624f3bf24d65629848b3828733