[automerger skipped] DO NOT MERGE Separate SDP procedure from bonding state (2/2)
am: 7001ea1f7e -s ours
am skip reason: subject contains skip directive

Change-Id: I6082f3976fcd41a67a95f46837effa0a50d0e705