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

Change-Id: I662c02b4325b9e7295719719c158e5f8712467d6