Merge "Carrier ID table rollout latest_carrier_list_rollout_20210505 test This build IS suitable for public release." am: 4142b4600a

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

Change-Id: I14b18d40932d347ab65921fec295cc614774165f