Snap for 10491609 from 6fc10cc5e36ed47c16b6de40e63569eb468382bc to mainline-adbd-release

Change-Id: I2564d389b05823c7aee2740e8fd11c4e2aa00ce2