Merge "Merge "Delete config_killableInputMethods setting" into tm-dev am: 71188e55 am: 3134e4cd" into tm-d1-dev-plus-aosp