[automerger skipped] Merge "use @SystemAPI in AppOpsManager" am: 6649ea6d...
[automerger skipped] Merge "use @SystemAPI in AppOpsManager" am: 6649ea6d am: 7e114062 am: 4a9ea954
am: e68486fe -s ours
am skip reason: change_id Icb209f4d24470b806d24fb4dc3d2eb2ec92fa12f with SHA1 a101d8dd is in history
Change-Id: I087d008ade97b7d3f77d6ce08740f68074d2aa3e