[automerger skipped] Merge "Update effect AIDL state machine graph" into...

[automerger skipped] Merge "Update effect AIDL state machine graph" into udc-qpr-dev am: 6f07dabb -s ours am: 2eebe4f3 -s ours

am skip reason: Merged-In Icbabe75e24497594f8bc62985553c1c13d268dae with SHA-1 a8c5e014 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/24168023



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