[automerger] Revert "DO NOT MERGE: BondStateMachine: Check for null before calling getDeviceType" am: 903b0f6313 am: 32fb537700 am: 5039e3df88 am: dfca097027 skipped: 01143285bf

Change-Id: I1f65f9ac2cca075f469e2d3cf337419edad13fd8