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

Change-Id: I08f5b713d8af575b3b0e8f61c9ba9332d5527257