Merge "Revert "adb: Lower EP_ALLOC retry count""
am: 169590c47f

Change-Id: Ia31c905eab9cb5c1c51a951896a8d1ed17978927