Snap for 7478028 from a2707050575cdf1c3a3519c0a6bc0535a581c6a1 to mainline-adbd-release Change-Id: I15deff109b15aed7bed2ee421f3ea469c92a845c