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

[automerger skipped] Merge "Revert "DO NOT MERGE: Revert "Make CheckOp return allowed if any..."" into sc-dev am: 5d31eda9 am: 2f253eb2 -s ours am: b2caaf20 -s ours am: 233c8bcf -s ours am: a5d765c6 -s ours

am skip reason: subject contains skip directive

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



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