Snap for 8736029 from 3833eedd4cc878745e4686d760804c3fcc895f2b to mainline-go-adbd-release

Change-Id: I149a89314098cb81c31b9eb59a377f68f39dda53