[automerger skipped] Merge "Make NtpTrustedTime safer / expand docs" am: 49c903a0d2 am: 0330b350e4 am: a54fe6e8d0 -s ours
am skip reason: Change-Id Ie09da9db5d853b59829886a020de21a88da5dd51 with SHA-1 65f0f31bde is in history

Change-Id: Ia34911cc0f3e2a2fcaf3c48177c3f70a938c75b0