Merge "PBAP: Convert notifications to use NotificationChannel" into oc-dev