Merge "Let DnsManager fill in LinkProperties for private DNSes" into pi-dev am: 2a915264a6
am: a5fc870335

Change-Id: I72ecaa4f7d7320ffa2e0ba82fadafc947c8a6981