Merge "Multi-SIM - Fixing inconsistent naming in CarrierConfigManager." into nyc-dev