[automerger skipped] Merge "Fix missing IME switcher icon (w/ a hardware...

[automerger skipped] Merge "Fix missing IME switcher icon (w/ a hardware keyboard)" into rvc-dev am: aca9854a am: 7c53dba7 am: d9a85118 am: c3d6c98e -s ours

am skip reason: Change-Id I4a9ddf514a32a221c2372be0ca166fbdac555932 with SHA-1 b96865e1 is in history

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

Change-Id: I1bbc1a2420b1e6099fd8419877f017713241d712