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

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

Change-Id: Iec54c460edb144e4ff96dec165ebee65de73add4