[automerger skipped] VoWifi notification for emergency calls am: 202c227a8e -s ours am: 26d81ef143 -s ours
am skip reason: Merged-In Iaf52a642a0435a070b8280b098e7929cddde55f6 with SHA-1 b6e9b03b83 is already in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1990976
Change-Id: I8ecedbed44338edcdfe3f76ebf56d2511ada25c2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: