Merge "Fixes to DevicePolicyManager.setPasswordExpirationTimeout"