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

[automerger skipped] [automerger] Revert "DO NOT MERGE: BondStateMachine: Check for null before calling getDeviceType" am: 903b0f63 am: 32fb5377 am: 5039e3df am: dfca0970 skipped: 01143285 am: 6dd7bb0e am: 527fc68b am: 7ef7414f -s ours
am: bc628e96 -s ours
am skip reason: subject contains skip directive

Change-Id: I146d27834d92fcf50b642b172ec25f211e4ca26b