resolve merge conflicts of 91ed21a to nyc-dev-plus-aosp
am: 70ca8dcb0b

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

Change-Id: I77856dee30b17497fd94af9e0aa527d93ba25681