Merge "Skip dynamic load of known clock plugins" into udc-dev am: 9387c640...

Merge "Skip dynamic load of known clock plugins" into udc-dev am: 9387c640 am: 6ee95746 am: b968c608

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



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