[automerger skipped] Merge "Ignore SDP failure while bonding if SDP was not...
[automerger skipped] Merge "Ignore SDP failure while bonding if SDP was not attempted" into pi-dev am: e20ce635 -s ours
am: 46a2ca70 -s ours
Change-Id: I4bf0872f5c1d5d34421257cb2f47b6e4dc62dd4b