Merge changes from topic "wbs_cap" am: 304acfbc am: 30b648ac am: 1289bfa2

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



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