[automerger] DO NOT MERGE: BondStateMachine: Check for null before calling getDeviceType am: 39cda2a286 am: ecc5b62100 am: 090b2dd50f am: c510171295 skipped: a5fb533ed4 am: 77d4863bd1
am: 5e2e6697ec

Change-Id: I176bfa05ac5990b77defb24e0588c2eb38b6a6a4