Merge "DevicePolicyManager: annotate SystemApi" am: d63ebcf807 am: 5016cf0263 am: 14dee43669

Change-Id: I88cb20e9c283993cda6be98d73f0fbfdc3f4ce54