Merge changes from topic "pts-vcp" into main am: c9e456a0

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



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