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

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

Change-Id: I2ebd094d8f061bc82fefee6f2b939bc0fa2c820b