Merge "Refactor and expand tetheroffload Control and Config VTS" into oc-dr1-dev
am: 6d5cf73b75

Change-Id: Ib52f5a2753655739bdbdbf7b10d3b15c57f31b77