[automerger skipped] Merge changes from topic "effect_reopen" into main am:...

[automerger skipped] Merge changes from topic "effect_reopen" into main am: 3eb2a2c1 am: 4aaefb88 am: f24f1a44 -s ours

am skip reason: Merged-In I3e9fdc2d5eb50b8c1377e0da75573f0eba7ea3f1 with SHA-1 81bfcda7 is already in history

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



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