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

[automerger skipped] [automerger] DO NOT MERGE: BondStateMachine: Check for null before calling getDeviceType am: cebf7b93 am: 13f0e72c am: d0037c57 am: 24ca553b skipped: 64423e7c am: b2b5fd86 am: e95a8eb8
am: cccec23a -s ours
am skip reason: subject contains skip directive

Change-Id: Ia9309fb50eb3f739aadc8ec0333a8c2f1dea7d63