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

Change-Id: I8e88041c045af9a5548fa1fb0483807cee2f3418