[automerger skipped] Merge "VoWifi Emergency Call Notification" am: d34540e23a -s ours am: 2112fd04b2 -s ours am: 9ae824ea64 -s ours

am skip reason: Merged-In I9e2a7ea4e80e669584cacfdb176a53fd15bfa446 with SHA-1 ff2c3689df is already in history

Original change: https://android-review.googlesource.com/c/platform/packages/services/Telephony/+/1996807

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