[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: a0346fd4 am: 5ccb371d -s ours

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

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



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