Merge "Dismiss the "no service" notification if SIM is removed" am: eee3bc0b11 am: 87f337be0a

Original change: https://android-review.googlesource.com/c/platform/packages/services/Telephony/+/2626398

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