Merge "Fix the race between carrier config and DDS change"
am: 36538bb38c

Change-Id: Idf1e5c33560845095028127d6bc3f384471bd4a1