[automerger] MAP: Prevent NPE during Obex connect request am: 2af97af76d

Change-Id: I9f7bf70640190c7997a61be0fcbbf3a7095abdd9