Merge "TetheringTest: test upstream changes capabilities" am: 79adbb234e

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

Change-Id: Id179bb5159dfbf62484885618eb7cdfcb715bc0c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>