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

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



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