Merge "Stop supporting null IME token in IMM#setInputMethodAndSubtype()"