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

Change-Id: I804a1fec3ada0a394245d5edf0ace4597cc73db6