[automerger skipped] Merge changes from topic "effect_volume" into main am:...

[automerger skipped] Merge changes from topic "effect_volume" into main am: 30a16cce am: 1141f737 -s ours

am skip reason: Merged-In I38187906f74c7cabc564d1aa01426257a0d90ba6 with SHA-1 6da80931 is already in history

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



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