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

Change-Id: I34b40003f5336c68bb6725ba8cc8023495f1f4bf