[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: c1a7fc84 -s ours

am skip reason: subject contains skip directive

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



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