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

Merge "Revert "VoWifi notification for emergency calls"" into tm-dev am: 2e894a27 am: 5d0ee5f7 am: eee24db6

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17618862



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