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

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



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