Merge "MAP: Prevent NPE during Obex connect request" into p-keystone-qcom