am 94062517: Merge "Require bonding and encryption for PBAP server"

* commit '94062517ae5573f9a1a877a83fe7d8e6d1a2c350':
  Require bonding and encryption for PBAP server