Merge "Improve carrierconfig to support multisim in ServiceStateTracker"
am: 2291ba215a

Change-Id: I0a935ca07d09f00c2f2c5a5f1f5eb03d0887a886