aml_adb_331011050
Snap for 8944493 from 02ed6ce90cfb57b9cd9350bacb21afafa00c0018 to mainline-adbd-release

Change-Id: I403206a7853ff929c3455482d9c5568f2f156279