[automerger skipped] Carrier ID table rollout latest_carrier_list_for_prev_sdk_20210701 am: 927ad2b55f am: 8847084ae2 -s ours

am skip reason: Merged-In Ic01289a9a031d8900ad758aaa33cd4d7268dc737 with SHA-1 7e1afea5bc is already in history

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

Change-Id: I68c21df7321dffe54a0b10e742e97c03750575fe