[automerger skipped] Carrier ID table rollout latest_carrier_list_for_prev_sdk_20210701 am: 7e1afea5bc am: 9b823f3d6a -s ours

am skip reason: Merged-In I2d7601f45f21faabed1369535e87c10dc693e2ca with SHA-1 927ad2b55f is already in history

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

Change-Id: I38921f56a4974f2a50cb80021533e5365ca91276