Merge "Revert "DO NOT MERGE: Revert "Make CheckOp return allowed if any..."" into sc-dev am: 5d31eda995

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

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