Merge "BondStateMachine: Check for null before calling getDeviceType" into oc-mr1-dev am: 7a11b2cf89
am: b6ad28d7ac

Change-Id: Iaef336f51c37bcbb4e76d9c8c3ae312979d56b9c