Merge "Carrier ID table rollout latest_carrier_list_rollout_20210505 test This build IS suitable for public release." am: 4142b4600a am: 7306502bc4 am: 0004c5abaf am: 33f0b715b2

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

Change-Id: Idc729c5fdf9ec7556dc5295e18d312c902af1e1a