Merge "Conditionally disable TetheringApiCurrentLib" am: 2be7b1d5fb

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

Change-Id: I6db9edd8273807ba76c8974fa927c1079737154e