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

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

Change-Id: I76b45b48cbc04e4b239bb1e3e1ed01303a6278bb