Merge "Add local logs to NetworkTimeUpdateService" am: 6bda795c2b am: 7e16f6e837

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

Change-Id: I2b8f1b52565e59e87ba383a6cbf6f35257c8e10b