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

Change-Id: I967e075f3714cb7d1f5605aada6a73c4dfa2bfa0