Merge "Add correct_bond_type_of_loaded_devices flag" into main am: 8737a3d6 am: 0a0dbce2

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



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