Merge changes from topic "effect_volume_ctrl" into main am: 1084dc34 am: a0346fd4

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



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