Merge changes from topic "effect_ dependencies" into main am: 996e1ad8b7 am: 77af530748

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

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