Merge "Ignore modem crashes in SimChangeReceiver" into nyc-mr2-dev
am: 7cc6412abe

Change-Id: I0b0e7439bd902e7139d31ad9d838f64566b86b2d