Merge "Use new registered_plmn carrier config." into pi-dev