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

Change-Id: I257a317c862f6f16341e91c00990e92ae07fe78c