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 am: e91d0d0c

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



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