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

Change-Id: I2d61928c4e7787651b8fe8759bed6fc8f9dfacd3