[automerger skipped] Merge "Revert "DO NOT MERGE: BondStateMachine: Check for null before calling getDeviceType"" into oc-dev am: 43d0b63891
am: b22a98c98f -s ours
am skip reason: change_id Ia20df8fd920e86661beb5249e72464c8e9777815 with SHA1 3cae706d8e is in history

Change-Id: I73ce9303b8881515036a716643df94020e20e67b