Merge "Fixes setting password through DevicePolicyManager" into lmp-dev