Merge "Disable adb authorization in GSI" into oc-mr1-dev