[automerger skipped] Merge "Create carrier configs for MCC/MNC-specific...

[automerger skipped] Merge "Create carrier configs for MCC/MNC-specific roaming notification" into udc-qpr-dev am: f56282d3 am: 9ea23965 -s ours

am skip reason: Merged-In I1ffe39fd35649d773c38573953e271733802ed91 with SHA-1 54a831e4 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/25499009



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