Merge "Make PrivateAddressCoordinator ignore vpn network" am: 0989373740 am: 004f473e97 am: 9cd671a4a2 am: e6e08b9836

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

Change-Id: Id033b657976a0b29dad05f44a8f7117ada62b81d