[automerger skipped] Merge "Add new hidden-for-now AppOpsManager APIs to greylist." into pi-dev am: 7b8ac80db5
am: 7425f704ea -s ours
Change-Id: I26fb5d97a08ef448366e3985554db35fcb5149d2
This commit is contained in: