[automerger skipped] Merge "Cancel Emergency call warning and network...

[automerger skipped] Merge "Cancel Emergency call warning and network preference switch notification" into rvc-qpr-dev am: 962e4791 -s ours am: 0c7439ed -s ours

am skip reason: Change-Id I9640db04d977cc0c4b6cea8b0686bbb9891a56fa with SHA-1 7c7f0643 is in history

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

Change-Id: I688f0b6ad937263a04ae702fc260b700603b8549