Merge "Add tetheroffload VTS to general-tests" am: f358c7be57 am: 7699a94412

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2393025

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