Merge "Mark the bond type of loaded devices as persistent" into main am: cae7c96d am: 4187100c

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



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