[automerger skipped] Merge "Fix missing IME switcher icon (w/ a hardware keyboard)" into rvc-dev am: aca9854a66 am: 7c53dba761 am: e192b7630a -s ours am: ced8966f9d -s ours

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

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

Change-Id: If274c482c4af1c3528e28af24f121dab35007ab5