Merge "Complete Initialization of ClockRegistry in singleton provider" into tm-qpr-dev am: ebbbe43165 am: cbcf778ad1

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

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