Merge "use @SystemAPI in AppOpsManager" am: 83fe845c8c
am: 7ca0425127

Change-Id: I5deb21c0fdd034f3060a08b4d9f8ca44fdc21ddc