[automerger] Revert "DO NOT MERGE: BondStateMachine: Check for null before calling getDeviceType" am: 903b0f6313

Change-Id: I5fb786243a841a3bfe66f9e2735eb22243bc1df4