[automerger skipped] [automerger] Revert "DO NOT MERGE: BondStateMachine: Check for null before calling getDeviceType" am: 903b0f6313 am: 32fb537700 am: 5039e3df88 am: dfca097027 skipped: 01143285bf am: 6dd7bb0e75 am: 527fc68bc6
am: 7ef7414f96 -s ours
am skip reason: subject contains skip directive

Change-Id: I040972c1230916267cd4a049e2743abbe552e7a6