Merge "Grant adb auth under recovery for unlocked & userdebug devices"
am: 7cfb77ed8d

Change-Id: I709d0dac741518782771659eef1ed3099cf02366