[automerger skipped] Merge "Revert "DO NOT MERGE: BondStateMachine: Check for null before calling getDeviceType"" into oc-dev am: 43d0b63891 am: b22a98c98f -s ours am: 8b4e8193cf -s ours
am: 13251aa47f -s ours
am skip reason: subject contains skip directive

Change-Id: Ic3efece8729338b22e0b2d015d6ce60d744071f1