Merge "EffectProxy return the active sub-effect descriptor" into main am: 7abcc98802 am: 965bdfbc26 am: 467e03b448

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

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