Merge "Remove mRetryMgr and directly use DataConnection retry mgr."