Merge "Support notifying Telecom when a call is ended due to new emergency call" am: dfd78b4940
am: 1d10232b1f

Change-Id: I645cdf2edf630d176fc1984835d0bbf85c5724f5