Merge "Fix NetworkMonitor won't do private dns resolution"
am: c895b818e0

Change-Id: I7c7a573bef77ba952219e6f6f56ab11f0211e0a7