Merge "Improve carrierconfig to support multisim in DcTracker"
am: 3029837a6c

Change-Id: Ibc51c19f49a101420c36a992341d63ce2ea4db6e