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

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

Change-Id: I4d8c87e25654fe35ba2f6b0147c7e0e5073cf7e6