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

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

Change-Id: Ib574e7c41e82272bfe58becaa3d3b3a91841d808