Merge "Merge "Lock down IME switcher notification handling" into oc-mr1-dev am: 37f2e48697" into oc-mr1-dev-plus-aosp