Merge "Add PBAP client to ProfilePrioritiesEntity" am: 77664ec891
am: ff68b943e5

Change-Id: Ic21a5c6ed6fc8ec17106b536a382345aec02970b