[automerger skipped] Merge "Initial ClockPlugin interfaces and ClockRegistry...

[automerger skipped] Merge "Initial ClockPlugin interfaces and ClockRegistry functions" into tm-qpr-dev am: e71aec0f am: 5a54cd99 -s ours

am skip reason: Merged-In I2bc8be56f9fb91734aa7d430270c3e9ad7328ed0 with SHA-1 c2254172 is already in history

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



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