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

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



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