[automerger] DO NOT MERGE Don't persist bonds using sample LTK am: c0fb2a25f9 am...

Change-Id: I6d433ec513e6f04b8e117a08a9ce5bebdd42d8d4

diff --cc btif/src/btif_storage.c
index 83c01e2,9fb623a..468c6f0
--- 1/btif/src/btif_storage.c
--- 2/btif/src/btif_storage.c
+++ b/btif/src/btif_storage.c
@@@ -858,7 -914,10 +901,9 @@@ bt_status_t btif_storage_load_bonded_de
      uint32_t disc_timeout;
      bt_uuid_t local_uuids[BT_MAX_NUM_UUIDS];
      bt_uuid_t remote_uuids[BT_MAX_NUM_UUIDS];
 -    bt_status_t status;
  
+     remove_devices_with_sample_ltk();
+ 
      btif_in_fetch_bonded_devices(&bonded_devices, 1);
  
      /* Now send the adapter_properties_cb with all adapter_properties */