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

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



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