Merge "DevicePolicyManager: annotate SystemApi"