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

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



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