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

[automerger skipped] Merge "Prioritize metrics for emergency calls" into tm-dev am: 0c3f00a7 am: eb24c0b0 am: cf4417ce -s ours am: bb98919d -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: Id29488e13c51b572e6b2599dc92c87e54b62cc22
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>