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

Change-Id: Ieb482e6c5284731806acb1391857bcc1999b2f27