Snap for 10428683 from dab5a943946be1805fedc9c609c1a6647f156f9e to mainline-adbd-release

Change-Id: Icf89894c3e50eee74d819a2d6b52ad7e04f177cb