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

* commit 'd94fbf85d6b9affc29fb312abd3548f3727c80c4':
  DO NOT MERGE: Multi-SIM - Fixing inconsistent naming in CarrierConfigManager.