[automerger skipped] Merge "Test VolumeControlService.dump" into tm-qpr-dev...

[automerger skipped] Merge "Test VolumeControlService.dump" into tm-qpr-dev am: 1e553e61 am: f6e5fb69 -s ours

am skip reason: Merged-In I3663bf21c948e9819916701a557701db79f04220 with SHA-1 41eb1362 is already in history

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



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