Merge "Revert "VoWifi notification for emergency calls"" into tm-dev am: 2e894a27 am: 9ad25394

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



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