aml_adb_331011050
Snap for 8944493 from 590edb9ae2c270621c3e601d9913b1323043a796 to mainline-adbd-release

Change-Id: I591c85f3b020a2859b185b7756276b0d699a2458