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

Change-Id: I788843d8b1d6925ec5422a1ef7f24e57374ada9b