[automerger] Revert "DO NOT MERGE: BondStateMachine: Check for null before calling getDeviceType" am: 903b0f6313 am: 32fb537700 am: 5039e3df88 am: dfca097027

Change-Id: Ia112e24b28f63ea8ccd55bc1c0f46571b422f358