[automerger skipped] Merge "Let DnsManager fill in LinkProperties for private DNSes" am: 59e139a767 am: ce9434a9a2  -s ours
am: d085018e09  -s ours

Change-Id: Id29fb6d0e81e0539f59652f203f0cffc973b2e1d