Merge "Add user aware getPermittedInputMethods in DPM"