Merge "b/2498180 b/2568119 Retry if BT dock disconnects unexpectedly" into froyo