Reduced the retry after disconnect delay

Reduced the delay from 20 seconds to 10 seconds. And created
a separate delay configuration for it.

Test: Manual
bug: 63633916
Merged-In: I793e2172657e27fb2153d456e846a0c9c5e451af
Change-Id: I793e2172657e27fb2153d456e846a0c9c5e451af
(cherry picked from commit da21f0de)