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

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

Change-Id: Ia0bb5d17457fb38ab4139bd5c53405741cbf6cdd