Merge "Conditionally disable TetheringApiCurrentLib" am: 2be7b1d5fb am: 0616811965

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

Change-Id: I3274ec07cfc3729f3c9ea375ecdd01a7997c88c5