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

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



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