Merge changes from topic...

Merge changes from topic "revert-17034757-VoWifi_Emergency_Notification-NYDZQSHARD" into tm-mainline-prod am: 5d8e5fe5

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



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