Merge "Fix bug in NetworkTimeUpdateService" am: aca3aa1748

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

Change-Id: If1aabde051ad948cb6741b0ff6037a3f07a83a42