Merge "Command-line interface: NetworkTimeUpdateService" am: 8ac370e63f am: 7b559562f7

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

Change-Id: Ia2389b5e2018bc27a19e4a8bc057baaa37e544fe