[automerger skipped] [automerge] Revert "DO NOT MERGE: Revert "Make CheckOp return allowed if any..." 2p: f21335c469 am: 0440b6851b -s ours am: dee4feed74 -s ours

am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19441568

Change-Id: I1296f9a6f315c1d6f1cae6ee5167ac6ab5553596
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>