Merge "Multiuser support in ClockRegistry" into tm-qpr-dev am: c38b9fdb am: c067f64b

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



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