Snap for 9159017 from 23d35bbfafc784a7dfe686e7954a53cac60caf2b to mainline-adbd-release

Change-Id: I3d71f0bb9c868191131bc931792949efb51d135d