[automerger skipped] Merge "VoWifi notification for emergency calls" am:...

[automerger skipped] Merge "VoWifi notification for emergency calls" am: f40d62dc -s ours am: 74069b9d -s ours am: e0cccc94 -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: I616e50aeb29091145d8ac0397f5467b6c0d339c4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>