Merge changes from topic "effect_reopen" into main am: 3eb2a2c1 am: 4aaefb88

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



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