Merge "Revert "VoWifi notification for emergency calls"" into tm-dev am: a0ae3d9a

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/telephony/+/17618861



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