aml_adb_340912350 (11342939,com.google.android.adbd)
Snap for 10428683 from f0e069fa0d4f7e7f14e8b27761b9bb70d0f4502f to mainline-adbd-release

Change-Id: I713932c34abc7e82886ee2715bf0915d7dbe25a4