Snap for 10428683 from a17ca3ffec0711b9e5e0b991071b8f76bc295b95 to mainline-adbd-release

Change-Id: Iffb7fae4874e5c07e24e2a095fc7b12cd855a9b7