[automerger skipped] Merge "Add VolumeControlNativeInterfaceTest" into...

[automerger skipped] Merge "Add VolumeControlNativeInterfaceTest" into tm-qpr-dev am: 3d5ad38b am: 7aefccbf -s ours

am skip reason: Merged-In I30ab97d9411e3704e176d82f2d77b2b2af305fed with SHA-1 cffc59eb is already in history

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



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