[automerger skipped] Merge changes from topic "24d1_effect_chain_improvement" into 24D1-dev am: 99fbd7c238 -s ours

am skip reason: Merged-In I9b6d6c350106b233d3ea856bfa4df81ce35a54ec with SHA-1 7eb61b87a3 is already in history

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

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