[automerger skipped] Merge "DO NOT MERGE Revert "BondStateMachine: Check for null before calling getDeviceType"" into oc-mr1-dev
am: b1a3bc00f8 -s ours
am skip reason: subject contains skip directive

Change-Id: I05fc379f8876baf2c6ee3bf0927ac55b21ccac3f