Merge "Make NTP config configurable from cmd" am: 271dfbe8df

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

Change-Id: If16a743fc61890fd9e64856edc3bd8ccc9a4dd46