[automerger skipped] Merge "Only apply VPN isolation if it's fully routed" into rvc-dev am: 43bc020f am: f2f5ad9a -s ours
am skip reason: Change-Id I59cf48552bca98092d1212e3d718fd420add5458 with SHA-1 080f2179 is in history
Change-Id: I28e2ff1095f168d1e3c7321ab52629b0a9391c1d