[automerger skipped] Merge "VoWifi notification for emergency calls" am: f40d62dc -s ours

am skip reason: Merged-In Iaf52a642a0435a070b8280b098e7929cddde55f6 with SHA-1 b6e9b03b is already in history

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



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