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

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

Change-Id: Ibd2196a4c18440c1925de2fa4919042f6cc37906