Merge "[automerger skipped] Merge "Fixup SntpClient to bypass Private DNS" am: a7183b92c4 am: 95cb9a1cb3  -s ours" into pi-dev-plus-aosp