Merge "Start adbd in user mode if bootloader is unlocked" am: b65dd9cb0c
am: e5288e6b69

Change-Id: I02c35302868aacdbc5ff513034f42e475a0805c7