Merge "Revert "PBAP server, send favorite contacts"" into qt-qpr1-dev am: afb0f463f4

Change-Id: I1348c8e187bed17e0f52217e2a80dcc5a081ac51