[automerger skipped] Merge "Add support for new outgoing SMS metrics" am:...

[automerger skipped] Merge "Add support for new outgoing SMS metrics" am: 8bb1aa38 am: 98e8d0d4 am: 9340e171 -s ours

am skip reason: Change-Id Ib071616de155056fdce85ac676d92ef1189c2097 with SHA-1 48bcf01e is in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/telephony/+/1544667

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I9b756e16684e4bfe2bdf5017df922ffe28e33538