Merge "Merge "Lock down IME switcher notification handling" into oc-mr1-dev...
Merge "Merge "Lock down IME switcher notification handling" into oc-mr1-dev am: 37f2e486" into oc-mr1-dev-plus-aosp
am: adfbfeb3
Change-Id: Ia1033bd1c9746f86c4b86c8cf0339f315fd63366