Merge "DO NOT MERGE: Multi-SIM - Fixing inconsistent naming in...
Merge "DO NOT MERGE: Multi-SIM - Fixing inconsistent naming in CarrierConfigManager." into mm-wireless-dev
am: d94fbf85 -s ours
* commit 'd94fbf85':
DO NOT MERGE: Multi-SIM - Fixing inconsistent naming in CarrierConfigManager.