am: 70d5c8d246 * commit '70d5c8d246e63f279f8893954ac650b6a0b7f0ca': Multi-SIM - Fixing inconsistent naming in CarrierConfigManager.
am: 70d5c8d246 * commit '70d5c8d246e63f279f8893954ac650b6a0b7f0ca': Multi-SIM - Fixing inconsistent naming in CarrierConfigManager.