aml_adb_331011050
Snap for 8944493 from f72483ae9b5835da4713781b122ee74ea1f8e590 to mainline-adbd-release

Change-Id: Id7ec66e765c8cd6ab9bcf92d465bb0ccdb508965