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

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

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