[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: 5a9d99bd -s ours
am skip reason: subject contains skip directive

Change-Id: I8ac32038f24d8100dfdc312ec76815f3e7553815