Merge "PBAP server, send favorite contacts" am: 60596bec01

Change-Id: I1108543b7afab9c87b5499e52bccbc022bd46465