[automerger skipped] VoWifi notification for emergency calls am: 202c227a -s...

[automerger skipped] VoWifi notification for emergency calls am: 202c227a -s ours am: 26d81ef1 -s ours am: 84e1a041 -s ours am: 3d8bd0f3 -s ours am: 211dbcee -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: I40fa92b9c76749b8ecea546ef9ad31a21a0aedce
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>