Merge "Remove PendingIntent based soundTrigger"