Merge "Fix inappropriate instruction code for AccessControlTest" into stage-aosp-pi-cts-dev