[automerger skipped] Carrier ID table rollout all_sdk_carrier_list_Rollout_20200610 am: e6bb99df75 am: 6928e121c6 -s ours am: 4d4dc63579 -s ours

am skip reason: Merged-In Ieb482e6c5284731806acb1391857bcc1999b2f27 with SHA-1 a11bff98a3 is already in history

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

Change-Id: I99f0ece60979b5e56ca5832543405ff7bc859313