aml_adb_340912530
Snap for 10428683 from fcbc06ee312337c606fe3606e9ad38c58b6b6bf6 to mainline-adbd-release

Change-Id: I49bb04f6f2d1f9d6268e8f7ed10eacc4dc40849e