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

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



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