[automerger] DO NOT MERGE: BondStateMachine: Check for null before calling getDeviceType am: 39cda2a286 am: ecc5b62100 am: 090b2dd50f am: c510171295

Change-Id: I9f5214ac3b8207e29b151b9737aba791e4dc6884