[automerger skipped] Merge "Show roaming notification based on MCC/MNC" into udc-qpr-dev am: 8740ed25ba am: 1d124d8d9b -s ours

am skip reason: Merged-In I130b4dc1daaaf2e1bdb7befb4528e5fda7b00206 with SHA-1 37b3907fc2 is already in history

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

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