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

Change-Id: I004e81a764313fdaf23f9580b144e1ee2ba79b27