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

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

Change-Id: I245100e8930bfd4879e7e61a2e31af8ecc1e4beb