[automerger skipped] Merge "[RESTRICT AUTOMERGE] Update IMMS to comply with...

[automerger skipped] Merge "[RESTRICT AUTOMERGE] Update IMMS to comply with Android's inclusive language guidance" am: d6239637 -s ours am: e4c0dbb8 am: d89656e3 am: e1f05398 am: 35b0a4ae -s ours

am skip reason: subject contains skip directive

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

Change-Id: Idec1984225a3ff9174ddd7bfda89471c1d1e6e73