Merge "Change android.permission.RESTRICTED_VR_ACCESS to SystemAPI" into oc-dev