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

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

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