Merge "Using common apex_defaults for com.android.tethering module." am: 6802eadef5 am: 36996876b0

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2007756

Change-Id: If7b94aa11b4c9e905aa6ab52559057b984da5f51