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

Change-Id: I639db7fc5797ad2ce6dd6b3591284bd6822ab0f0