Merge "Using common apex_defaults for com.android.tethering module."