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

Change-Id: I2efc0385d9f12ea8a4cd9a7d0bb3a77364687bc5