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

[automerger skipped] Merge changes from topic "effect_volume_ctrl" into main am: 1084dc34 am: a277c419 -s ours am: 47cd67e9 -s ours

am skip reason: Merged-In If18d6115a6223f9f76e205f8128089d9af9d5a1d with SHA-1 cb5bcc48 is already in history

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



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