tree f5e0ba1f7fc8338b99ca383f199e69c53a061a87
parent 40d02ae9da2edb607d7294c49177a982400dba32
parent 4d4dc63579be560a26493dbd716fa521d7cdd7c8
author calvinpan <calvinpan@google.com> 1625796935 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1625796935 +0000

[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