Merge "Update PhoneStateListener#onOutgoingEmergencySms" am: c5d02da0f6 am: b37753c29a

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

Change-Id: Id088ab1812bb080f0384df2f54e40917fc862440