[automerger skipped] [automerged blank] Revert "DO NOT MERGE: Revert "Make...

[automerger skipped] [automerged blank] Revert "DO NOT MERGE: Revert "Make CheckOp return allowed if any..." 2p: f21335c4 2p: 2725ec7a am: 439a4c93 am: c48f3bdf am: 652f3160 am: 14dd14a7 -s ours

am skip reason: subject contains skip directive

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



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