Merge "Fix MobileNetworkSettings crash for multi-SIM device"