[automerger skipped] PBAP client, download favorite contacts am: e266b849f8 -s ours am: 782d98358c -s ours am: be9036e266 -s ours

am skip reason: Change-Id I37ae4fea8d6695a6deaea86e385b209d3a0789bf with SHA-1 bc9037fa3a is in history

Change-Id: I46532265c08d3539ffa82e209180666954f9bb38