tree 3fddf8d5072cb27f481b22768580832224109210
parent d5a5a24ff53bb516b08f49cedd1760cd357d8f69
parent 4154e81333a262b7a69418eb69a926fcec396b93
author Calvin Pan <calvinpan@google.com> 1630304497 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1630304497 +0000

[automerger skipped] Merge "Carrier ID table rollout all_sdk_carrier_list_Rollout_20210827" am: 4154e81333 -s ours

am skip reason: Merged-In I68c21df7321dffe54a0b10e742e97c03750575fe with SHA-1 f5f82de948 is already in history

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

Change-Id: I8ddbe0c5ee40d4b4cd6190f63cf9339a1d914f2c