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

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



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