Merge "Fix condition where an incoming CDMA call hung up emergency call" am: 1bbc2b6e81
am: 99542f23d0

Change-Id: Ia0ab361221ba37a3c24844e3acb926346b318769