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

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

Change-Id: I2bc13a1436c780f3b7d4055eecd668682063906b