Merge "Change DevicePolicyManager APIs as requested"