Make code changes to support moving ip-up-vpn

Bug: 205301887
Test: Build target
Change-Id: I0a7da744d0ed6b688a8c33b62e725c104882f96b
1 file changed