Merge "Conditionally disable TetheringApiCurrentLib" am: 2be7b1d5fb

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

Change-Id: I2eaa731f5048db62a8966320a979f8c2c8747cc4