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

am skip reason: subject contains skip directive

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



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