Merge "Override for testing when clock is not set" into tm-qpr-dev am: 2e1ca7f6

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



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