[automerger skipped] Merge changes from topic "volume_effect_param" into main...

[automerger skipped] Merge changes from topic "volume_effect_param" into main am: 84c1787b am: fa4bf0c9 -s ours

am skip reason: Merged-In I20ab2e878a3bb6ef422a2021150a9b7b7f5ee110 with SHA-1 61b571ab is already in history

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



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