[automerger skipped] Merge "Carrier ID table rollout latest_carrier_list_rollout_20211104 This build IS suitable for public release." am: 3e6fb12335 am: 375984ab79 am: 9f4c671f80 am: 1a33138d31 am: eb2d4813f5 -s ours

am skip reason: Merged-In Ibafd8c89896133f2a7fbea23f5f1dd8113a18aa7 with SHA-1 1266f6f6d0 is already in history

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

Change-Id: Ibaa97404e8be6fa66c44761d4917185217687b3f