am 34ca22d2: Merge change 26366 into eclair

Merge commit '34ca22d25303633c855a738409ea2f8e3f79a713' into eclair-plus-aosp

* commit '34ca22d25303633c855a738409ea2f8e3f79a713':
  Set the bonding for incoming connections only when authentication is requested.