Merge "[automerger skipped] Carrier ID table rollout latest_carrier_list_for_prev_sdk_20200708 am: b8b52da3ea am: bd3f9b51cb am: 5c9188c635 -s ours" into rvc-qpr-dev-plus-aosp am: 6bcab2ff45 -s ours am: 490a464402 -s ours

am skip reason: Change-Id Ieb482e6c5284731806acb1391857bcc1999b2f27 with SHA-1 a11bff98a3 is in history

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

Change-Id: I367aea8ab1535da6193c180be59148334487ed10