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

Change-Id: Ia7b6f2835fe075ecbab865d7a2321f817cc2369a