Fix bug where a bonded device could enter BONDING and BONDED states again. am: 1d5616a6
am: 938e9cb2 -s ours
* commit '938e9cb2':
Fix bug where a bonded device could enter BONDING and BONDED states again.
Change-Id: Ifb35e23636d7350ef6bbffb8758b2e5f0839b750