Merge "Allow multiple clock plugins simultaneously" into tm-qpr-dev am: 5c4704b7 am: c0f8c735

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



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