tree f5e0ba1f7fc8338b99ca383f199e69c53a061a87
parent af6c358ff4813732fea18cad0f792c9233c0eb06
parent d9525a6b1dccb888e16804dbaedd75cbb83d0def
author calvinpan <calvinpan@google.com> 1625796938 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1625796938 +0000

[automerger skipped] Carrier ID table rollout latest_carrier_list_for_prev_sdk_20200626_1 am: 963186ed66 am: c8cd710cfe -s ours am: d9525a6b1d -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/+/12009341

Change-Id: Ib96da79a36861aa826fb16ab9c11c1853ac316d6