Merge "DO NOT MERGE: Multi-SIM - Fixing inconsistent naming in CarrierConfigManager." into mm-wireless-dev