[automerger skipped] Merge "Changes to plugin events to better match...

[automerger skipped] Merge "Changes to plugin events to better match AnimatableClockView" into tm-qpr-dev am: a5cf66dc am: 3026a2cd -s ours

am skip reason: Merged-In Id25a9efc4bb2410f03634b8f8ab3ed301af07bf9 with SHA-1 12e7465f is already in history

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



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