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

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



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