Merge "Device consolidation in control blocks after bonding" am: d5177caf...

Merge "Device consolidation in control blocks after bonding" am: d5177caf am: 5b674174 am: 165a1a3e

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



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