Merge "Cancel Emergency call warning and network preference switch...

Merge "Cancel Emergency call warning and network preference switch notification" am: 70c6b78f am: 9ae1a7d8 am: 6198b107 am: 3c7aacb9 am: f21b4f53

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

Change-Id: Id793330062451b8f652faa0081a23d1b28705769