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

Change-Id: I27c2aa961fce4d7ee19ded54e4e3cc3172bec850