Merge "BondStateMachine: avoid adding device to mDevices" am: 719069f58f

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

Change-Id: I527407311492a853e8f4b137d916179d2ca80f9c