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: b8e487ef am: 6116b488

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



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