Merge "Fix the race between carrier config and DDS change" am: 36538bb38c am: 514010fc25
am: 594ee80cb1

Change-Id: Ie45c9b2ccb986ec92d4efbe99e9682e01304c28c