[automerger skipped] Merge "Reset VolumeControlService after the test runs"...

[automerger skipped] Merge "Reset VolumeControlService after the test runs" into tm-qpr-dev am: 49008ab2 am: 0d7e0797 -s ours

am skip reason: Merged-In Ice98a8c7acf6deb0e196357f2d897db9cadcaf93 with SHA-1 35767ec2 is already in history

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



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