Merge "Hardening token validation in InputMethodManagerService"