Merge "Revert "VoWifi Emergency Call Notification"" into tm-dev am: a9e6253d66

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

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