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

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

Change-Id: I02280cad7342c5fa1a2aa4a895bf2655ce099d61