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

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

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