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

Change-Id: Ib89506d198703732453c2d58788ef651c5109a62