Merge "Refactor 1.0 TetheroffloadControl VTS" am: 628db71ca0 am: 589ee9d105

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

Change-Id: Id502822354593e3f434b38bde5bf708a2afd53e0