Merge "Stop setting the legacy net.dnsX system properties" am: 61da71aa03 am: 5b53e5f4d6 am: 1eb54fa910

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

Change-Id: I2f310676bd67385921b42f47777dcb522e343ffa