Merge "Improve carrierconfig to support multisim in SIMRecords"
am: 9981d8ad86

Change-Id: I75c0ecc317dfb416a03982e56e4dbe0f2b0ec0fc