Merge "Carrier ID table rollout latest_carrier_list_rollout_20201111" am: 2763e5ac19 am: a37f750080

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

Change-Id: I9095a6d27906eea20fb4d10bd11dc800f83e52f2