[automerger skipped] Merge "Revert "DO NOT MERGE: BondStateMachine: Check for...

[automerger skipped] Merge "Revert "DO NOT MERGE: BondStateMachine: Check for null before calling getDeviceType"" into oc-dev am: 4e3b8eef am: a63fe1ac -s ours am: 50470cf4 -s ours am: e49b5317 -s ours
am: 54c2f499 -s ours
am skip reason: change_id Ia20df8fd920e86661beb5249e72464c8e9777815 with SHA1 dbc27008 is in history

Change-Id: Ic780d64288eb8c1c3f72b445df131b9254796833