[automerger skipped] Merge "Parent: cc2d51fc (Merge "Update language to...

[automerger skipped] Merge "Parent:     cc2d51fc (Merge "Update language to comply with Android's inclusive language guidance") Author:     Paul McLean <pmclean@google.com> AuthorDate: 2020-07-28 15:07:26 +0000 Commit:     Glenn Kasten <gkasten@android.com> CommitDate: 2020-08-04 00:06:51 +0000" am: 830c70ad am: ff642c40 -s ours

am skip reason: Change-Id I4b3affce57ba61ad9697e91f2a5f63556ee1cd62 with SHA-1 5b0078de is in history

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

Change-Id: I67ecbc1e51d6f0316c2bc1e99902a6d658b5790d