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

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

Change-Id: Ieb50122404fee39940f88e1386d5578b4a30e619