Snap for 10428683 from 76cf1778d456b640986e0ba380c619dfdddf086f to mainline-adbd-release

Change-Id: I47cf9771df18e744dba61300dfcc8e2beab7507d