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

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

Change-Id: Iabe9ac8b0f82bdadc3c089d36fc22913118b3ab5