Merge changes from topic "am-664c4e95-f6bd-407e-90d3-78bd4b042c9d" into q-keystone-qcom-dev

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