Merge "Merge "Refactor and expand tetheroffload Control and Config VTS" into...
Merge "Merge "Refactor and expand tetheroffload Control and Config VTS" into oc-dr1-dev am: 6d5cf73b am: 6816c11e" into oc-mr1-dev-plus-aosp
am: f8b08b9c
Change-Id: I5f47e83edfb93ae9b3f4daddd39b28a9a32092ff