Merge "com.android.Phone crash popup during Phone app crash" into nyc-dev am: 0e2238b
am: 2cde1d7

* commit '2cde1d71498e5164cdbc5ffff41465e0bc3259e2':
  com.android.Phone crash popup during Phone app crash

Change-Id: I362bef95d2f4e686e55ace644e43c1c7dd54b1ee