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

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

Change-Id: I130221cea7b7da0775605aa638441a31074d9489