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

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

Change-Id: I4c7d0a18bece446ccc828acfd3e70d91d74e902e