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

Change-Id: I614101fbd3cd70f42d3ec61ede5e753aa3962b12