[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: 35e534b4 -s ours am: c30fd1fc -s ours am: c0ca348c -s ours am: 1b4b2197 -s ours

am skip reason: subject contains skip directive

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



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