[automerger skipped] Merge "Allow non-system server code to AppOpsManager.checkOp and NoteOp" am: ad70ff1e44 am: 728a3bfe0e -s ours am: 8f1f924bbe -s ours
am skip reason: Change-Id Ie6fe90b5737a1cd24e45446ea91560940b41c8fc with SHA-1 b093a01a4a is in history
Change-Id: Iaf077f1249b1506072219661d1f31f00db4ed698
This commit is contained in: