Merge "Use IpUtils, NetworkStackConstants in DadProxyTest" am: 80794b2476 am: 303cd3e30b am: 32950484f5

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

Change-Id: Id430f1fd9b0bfa1fff84bee48353b7c49e2b118b