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

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

Change-Id: I84439877d8ade20e17f92acd1fb70034ca69da34