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

Change-Id: Icd3704b1726001b1bd2dae11094b5727166d7b4e