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

Change-Id: Ia9f34805faae4180d65b7fa3ed40aff719d28cd9