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

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

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