Merge "Fix bug in NetworkTimeUpdateService" am: aca3aa1748 am: ac9139a6f7 am: a9120ace60

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

Change-Id: I01d4031236074ae72e2e168d81cbebc376df3f14