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

[automerger skipped] Merge "Add support for new SMS metrics" am: 1559e86f am: b0436adb am: 2579058d -s ours

am skip reason: Change-Id I9fcca1c8487b9c1a4b5c69cdec51876da8093746 with SHA-1 16c469bc is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I8f3f2f02d1e3909e6b29fd8c955ca54d99943aac