Merge "Fix MobileNetworkSettings crash for multi-SIM device" am: 33cf927f86
am: 0f33d879c3

Change-Id: I2ca4c576b53b8e3780f6b5a7a5ecd83f4a5ca0db