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

Change-Id: I0cc6e11f41e1d669a1629a09aec9065c44d8487b