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

Change-Id: I2c69a471dca995e474893d2ec068cc001c2c8b5f