Merge "use @SystemAPI in AppOpsManager"