[automerger skipped] Merge "Revert "DO NOT MERGE: Revert "Make CheckOp return allowed if any..."" into sc-dev am: 5d31eda995 am: 2f253eb28a -s ours am: b2caaf20fb -s ours am: 799b7d3ec0 -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19441568 Change-Id: I028870de9d299de431506cae45f6beea53fe8c85 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: