Merge "Prioritize metrics for emergency calls" into tm-dev am: 0c3f00a7 am:...

Merge "Prioritize metrics for emergency calls" into tm-dev am: 0c3f00a7 am: eb24c0b0 am: fc59b2c7

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



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