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: 54bb6379 am: 160cc3f3 am: 877b8d6b

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



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