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

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

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