aml_adb_331011050
Snap for 8746144 from 869069d79bf003fc5918659458cea966b5667529 to mainline-adbd-release

Change-Id: Ia3265a247ac1d77ea709fc49eaaed1187e8cd59b