[automerger skipped] Merge "Move plugin definition to plugin library" into...

[automerger skipped] Merge "Move plugin definition to plugin library" into tm-qpr-dev am: f6e087e3 am: 4898a353 -s ours

am skip reason: Merged-In I591c337f8f6062befdb2a08f61a1456c5af04be3 with SHA-1 14f67f4d is already in history

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



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