Merge "adbd: don't require authentication for userdebug/eng builds." am: bf62136be4
am: 0360ada8f5

Change-Id: I386ebf095d083a1f34d0ba9d313e73f6aefdcac6