Merge "Fix com.android.phone system_app_crash"