Merge "Move non-access methods to checkOp" into rvc-dev am: 9999e8f08c

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

Change-Id: I88fecb5b542017cc219b95cad9b6a4369ea81bbe