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

Change-Id: I546b51efc67f05b6e5894c82e2aae1f1fcbfc764