resolve merge conflicts of 204e3fa to nyc-mr1-dev-plus-aosp
am: 2cdb924831

* commit '2cdb924831f5e9d35d677ae457b2739c7ed1bb00':
  [adb] Issue the "auth" emulator command before any other one

Change-Id: I64b7f25e51fe099be6cc7de2302ad2eaa1efb3bf