[automerger skipped] [automerger] Revert "DO NOT MERGE Separate SDP procedure...

[automerger skipped] [automerger] Revert "DO NOT MERGE Separate SDP procedure from bonding state (2/2)" am: a0405072 am: 14b93605 am: 23c95297 am: 9d498954 skipped: d2718a5f am: f9b7a283 am: 6f9b5c83
am: 512f14cf -s ours
am skip reason: subject contains skip directive

Change-Id: I276fdd20b81f08cc4a7defd6aadb8c2068f11c05