Merge "Transition between sim call and voip call states"
am: 8b987c5e7f

Change-Id: Ibdfeeb426c41eed0e27c2d7eae15942241f54060