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

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

Change-Id: Idbbe5128c77d67040deb197e3437bf81abf8c1ad