[automerger skipped] Merge "Allow non-system server code to...

[automerger skipped] Merge "Allow non-system server code to AppOpsManager.checkOp and NoteOp" am: ad70ff1e am: 728a3bfe -s ours am: 8f1f924b -s ours am: aa4706c0 -s ours am: 4a52f044 -s ours am: ed9b23ce -s ours

am skip reason: Change-Id Ie6fe90b5737a1cd24e45446ea91560940b41c8fc with SHA-1 b093a01a is in history

Change-Id: I6c288264fef779046fc665b8b39d3951c992eb57