[automerger skipped] Merge "VoWifi notification for emergency calls" am: f40d62dc54 -s ours am: 74069b9d8e -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: I388395fd420235e7f72ca33d3d3760c14900c856
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: