Merge "com.android.Phone crash popup during Phone app crash" into nyc-dev