[automerger skipped] Merge "use @SystemAPI in AppOpsManager" am: 83fe845c8c am: 7ca0425127 am: a5d9fba763
am: b92ef48424 -s ours
am skip reason: change_id Ief8d20b62df5fcd99980182d9bb896bd82ac70e9 with SHA1 324606e459 is in history

Change-Id: Iab81f50741c2d4a5e631a018884d06e087c7c8e4