Merge "TetheringTest: test upstream changes capabilities" am: 79adbb234e am: 7a647a0f29 am: dc9c5ac6fc

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

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