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

Change-Id: I50cc2f03ca950f6e769193bdb473e6bb73843ed2