Merge "Redial on the other slot upon radio disconnect" into nyc-mr1-dev
am: 25781a4425

Change-Id: I6a85f0139544239347e7c014ce9ea310ac1ee8ae