Snap for 8505378 from 77e5e4d3c77948643ba12191f79850711acf497d to mainline-go-adbd-release

Change-Id: Icb6d3825c164546e39c360bec5f5d70484699a01