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

Change-Id: Ibdfdae5219d7fe8c9f2ed3dba2edaa8bba2104aa