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

Change-Id: Ib7e0cb6047c5d6d838d8c37e6fcc14c6f76108f1