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

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

Change-Id: Ic0ce44ebf19e0ae6b0c7c879ef4bbbb89cbe11b9