[automerger skipped] VoWifi Emergency Call Notification am: b79871cecf -s ours am: 1968cc4bf8 -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: I3e07db7602e50ff951b8fa38945933ab8c64c1ea
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>