[automerger skipped] Merge "Make Emergency call notification not swipeable"...

[automerger skipped] Merge "Make Emergency call notification not swipeable" am: 61cc4387 am: dd287d02 am: d12fd3fd -s ours am: 8ce793ad -s ours am: d3a53505 -s ours

am skip reason: Merged-In Ia5ca001ce73e226628d4d46493017d13de024406 with SHA-1 b2edd25c is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/telephony/+/2439974



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