Merge "Add the ability to configure NTP port for tests" am: 72e04a7dc2

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2030083

Change-Id: Ib9ce60d57ccaece7a727e979fe939a80e9880399