Merge "Use r launch defaults for dcla for com.android.tethering."