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

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



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