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