[automerger skipped] Merge "Update PhoneStateListener#onOutgoingEmergencySms"...

[automerger skipped] Merge "Update PhoneStateListener#onOutgoingEmergencySms" am: c5d02da0 am: b37753c2 am: 75c5434d am: 22244c8e -s ours

am skip reason: Change-Id If27771aef1858ea92dd620b56368d1a6a4f61ab3 with SHA-1 4c1e8a2a is in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1470691

Change-Id: I8ee85a67e247f7b2b67bcf1cd484fadb6cca672f