Merge "Modify DevicePolicyManagerService to extend IDevicePolicyManager.aidl"