Snap for 8817865 from c044b3738e17ee4f81fd1b14d8af3916ad28b0e5 to mainline-go-adbd-release

Change-Id: Ia65f8c8c1f40683a29320f51d762c4a6edae12d8