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

Merge "Merge "Skip dynamic load of known clock plugins" into udc-dev am: 9387c640 am: 6ee95746 am: 97ecbda9" into udc-qpr-dev-plus-aosp am: a82294ab

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



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