Merge "adb: Lower EP_ALLOC retry count"
am: 7cd8349198

Change-Id: Ib9c22c54c0234299a1538428779425387b642c76