[automerger skipped] Merge "VoWifi notification for emergency calls" am:...

[automerger skipped] Merge "VoWifi notification for emergency calls" am: 8542ebc2 -s ours am: c2319b8e -s ours

am skip reason: Merged-In I494748118ca4d9b3f78e5167ea9a76ef1c896a57 with SHA-1 d046442f is already in history

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



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