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: Id791d37bcdfe70cb2623559e9f7937c5f1e16249