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

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

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

Change-Id: Iddd68bd2aa2c1a8feec247397706c828a1bc47bd