Merge "DevicePolicyManager API review changes" into mnc-dev