Merge "OBEX: Avoid pre-sending CONTINUE for SRM enabled case" am: edfb333a4d
am: cca3c9bb01

Change-Id: Ia9edce62a31b5344b5627bf0d141d72d40d6e37c