[automerger skipped] MNCs not in carrier_list can get the wrong MNC value am: a0adafc6f1 -s ours

am skip reason: Merged-In I1dbccf9d75a7a8ae896ca483935bc5e007843e75 with SHA-1 7c7d4c7d04 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/providers/TelephonyProvider/+/14663267

Change-Id: Idc2ed49a1ad7e4167388ebe182df407b9293e85c