[automerger skipped] Merge "Carrier ID table rollout all_sdk_carrier_list_Rollout_20210827" am: 4154e81333 -s ours am: 44af597715 -s ours

am skip reason: Merged-In I68c21df7321dffe54a0b10e742e97c03750575fe with SHA-1 f5f82de948 is already in history

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

Change-Id: I16a9ebf10954e63ecdf27b4517bc44f67e6af9c7