Merge changes from topic "latest_carrier_list_rollout_20200513_RC00-0beddd" am: 641784cdba am: f27e185bce am: a11bff98a3

Change-Id: I9f675cc450e7387bf06151c64d5242c061844b00