Merge changes from topic "pbp-source" am: 15c02e84

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



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