[automerger skipped] [automerger] Revert "DO NOT MERGE: BondStateMachine:...

[automerger skipped] [automerger] Revert "DO NOT MERGE: BondStateMachine: Check for null before calling getDeviceType" am: 48d7ccae am: 5c1f3b25 am: 7151ee40 am: 2c7dbb15 skipped: 6656c01d am: 83f6a64b am: 91ad5d13 am: 163e7255 -s ours
am: 698ae268 -s ours
am skip reason: subject contains skip directive

Change-Id: I146d27834d92fcf50b642b172ec25f211e4ca26b