[automerger skipped] Merge "Refactor Clocks to use MessageBuffer + Logger"...

[automerger skipped] Merge "Refactor Clocks to use MessageBuffer + Logger" into udc-qpr-dev am: aaff159b am: d4ab9e3b -s ours

am skip reason: Merged-In I663b5c3dcda4f0599e824a06e0187a8bc120d9c0 with SHA-1 ae159d98 is already in history

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



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