Merge "Fixup SntpClient to bypass Private DNS"
am: a7183b92c4

Change-Id: I51e0e71f81307c38599c4bbac385ebafeb9f441f