[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: 48c50ccd am: e34fa226 am: 824a6b93 am: ee6c5882 -s ours am: bfd630d1 -s ours

am skip reason: Change-Id I6dac60aac172a8fccf4b5671107b41c5c84ccd76 with SHA-1 c2236423 is in history

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

Change-Id: I1f0ab72719ea183b57e904faa4a64227e29282dd