Merge "BT: Synchronize Bond SM message processing and cleanup" am: 1a73827f6d am: 96576dc6cc

Change-Id: Icb33faa87f01e0fd29117ed215370b03716296cb