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

Change-Id: I69782cab6e333346e887a930f78fc0d7bb20e194