tree f5e0ba1f7fc8338b99ca383f199e69c53a061a87
parent 1b1e5f9283ca3a944ca0fc44b98d51c22509b5c3
parent c9f383080a21ee4548c9a39e38d9f4dd9cef5170
author calvinpan <calvinpan@google.com> 1625796941 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1625796941 +0000

[automerger skipped] Carrier ID table rollout latest_carrier_list_for_prev_sdk_20200708 am: b8b52da3ea am: 0f81919860 -s ours am: c9f383080a -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/+/12108263

Change-Id: I111114e85d3e27b92c2b5942b34dc732ae9d9172