Merge "[adb] Followup CL to clean up adb_auth_host.cpp" am: 9c7f9215e4 am: 979998b965
am: e5635175ab

* commit 'e5635175ab84195d908e23a464ac5ee6d5b672cf':
  [adb] Followup CL to clean up adb_auth_host.cpp

Change-Id: I22756abfb7fb8435dca53b2d865968b44292157e