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

Change-Id: I2c59cde57994ea71cc602485df49da48a612fd73