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

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



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