Merge "DevicePolicyManager: annotate SystemApi"
am: d63ebcf807

Change-Id: Ieef5ffc0f01fba54c9e21b0bee22e82b585f8487