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: 0a61c39f am: 811b309f am: 604de0ae

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



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