Merge "Fix missing IME switcher icon (w/ a hardware keyboard)" into rvc-dev am: aca9854a66 am: 7c53dba761 am: d9a85118ec

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

Change-Id: Ic4d291565221ec9aaa3e14c2453c3ab9573e9d30