Merge "Make PrivateAddressCoordinator ignore vpn network" am: 0989373740

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1413610

Change-Id: I0a5398513c4572db839e3713109bb326f0261954