Merge "Ensures Accessibility button always overrides IME switcher" into oc-dev am: 684607f7f6
am: 66ebc6ad2c

Change-Id: I3512d87717f91e89f6fdb269c15d934c78337a3b