[automerger skipped] [automerge] Revert "DO NOT MERGE: Revert "Make CheckOp...

[automerger skipped] [automerge] Revert "DO NOT MERGE: Revert "Make CheckOp return allowed if any..." 2p: f21335c4 am: 0440b685 -s ours am: dee4feed -s ours am: 551d1b85 -s ours am: f5e21b96 -s ours

am skip reason: subject contains skip directive

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



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