Merge "[automerger skipped] Merge "Prioritize metrics for emergency calls"...

Merge "[automerger skipped] Merge "Prioritize metrics for emergency calls" into tm-dev am: 0c3f00a7 am: b6090f47 am: 0f8790df -s ours" into tm-qpr-dev-plus-aosp am: 647dde28 -s ours

am skip reason: Merged-In I931ba6ff1a80e23803003bbccb16c5c3522f7e16 with SHA-1 97a1baa1 is already in history

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



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