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

Change-Id: I9898f4f5007c6d05d91b6c2a8387d3dd81d425ee