Snap for 8717925 from d52dde30d24325a1abb09f8bc24e76636f1d5746 to mainline-adbd-release

Change-Id: If95e1030faa9c17651f4ae3344046652b516fd7b