Merge "Conditionally disable TetheringApiCurrentLib" am: 2be7b1d5fb am: 0616811965 am: e00b8cee54 am: 111b67f5b6

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

Change-Id: Ia3223e21b4b7efcc2ae877087e4ac820dfb51fae