Merge "Allow injecting cached NTP time without network" into tm-dev am:...

Merge "Allow injecting cached NTP time without network" into tm-dev am: f840778b am: 7c02611c am: 71140a14 am: 7529df43

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



Change-Id: I3891c8c9234b5f2ac783c5ce18e8c0f00d753d3b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>