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

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

Change-Id: I235388b4828f7fc99c9e0776cac210dce7ba425a
tree: 2d8ff881719038cd4a62f27822de662518101100
  1. tests/
  2. Tethering/