Merge "This bug was fixed in S, don't test for it in R" am: d639d12161 am: a56ea8445c am: 57674cb4d7

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

Change-Id: I6d7b4a2b1b952b7d12f482ffd44676e19f28ee31
tree: 5d310d6b1c94629107f003e91b4e7c3c2dbd924f
  1. tests/
  2. Tethering/