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

Change-Id: I26c140fafba2b23b0e6fc73929767c0fce73fe45