[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

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

Change-Id: I54b16fa79369e5a6fb097d831e6e5e23e2fd8a38