[automerger skipped] Merge "Support effect destroy at any state" into main am:...

[automerger skipped] Merge "Support effect destroy at any state" into main am: 3d4cc3ba am: 6cbd6ee4 -s ours

am skip reason: Merged-In I98c2ece090cf1d691180e10b3d92b7fb57d9f229 with SHA-1 11420445 is already in history

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



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