Merge "adbd_auth function signature changes." am: 44a12390d4 am: c12a8522f8

Change-Id: Idb9f945491e2c144cf569c4a10b0ff917aaec148