Merge "Add SMS latency to metrics" into tm-dev am: cc97221c am: 3a6cf2de...

Merge "Add SMS latency to metrics" into tm-dev am: cc97221c am: 3a6cf2de am: 8d1795c9 am: 810283b7

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



Change-Id: Ib0f72415355e02a267231f27c6ee039e2649b758
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>