Merge "Merge "Fix voice call setup duration metrics." into tm-d1-dev am:...

Merge "Merge "Fix voice call setup duration metrics." into tm-d1-dev am: d598949a am: eb808d98" into tm-qpr-dev-plus-aosp am: 95a70ddc

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



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