[automerger skipped] DO NOT MERGE Separate SDP procedure from bonding state (2/2) am: 9a79545b
am: 6ac83394 -s ours
am skip reason: change_id Ifefb749e0274ae018714340654287a0412b59b89 with SHA1 d02a284e is in history
Change-Id: I604b8f1077c6a9a3aae4488a5f2180a13a1cf913