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

Change-Id: Ibc85f16de96c61bb9599c88552ae092ca4b926af