Merge "VCS: Minor fix for initial volume set and refactor" into main am: 9d9a63aa

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/3379985



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