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

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

Change-Id: Ic2465b590a3137041ba709d9b280058c64e3c7b2