Snap for 8857176 from 6e5773dd058d2af5ef004863ae47a6938781c692 to mainline-go-adbd-release

Change-Id: Ie40faa7073eac480a6a6dba48ec33480bfcd5f00