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

Change-Id: I16c87cb11e92ec2267dfa66c7da2904aa05e3644