Merge "Effect AIDL: cleanup dependencies" into main am: 2295d90967

Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/2874918

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