Merge "Support additional dynamically linked library in plugins" into udc-dev...

Merge "Support additional dynamically linked library in plugins" into udc-dev am: 2aa4ac32 am: 8f7b11fd

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



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