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

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

Change-Id: Ia24fc0a73f74756a8b764961f5ac6023f478f327