Merge "Prevent NotificationManagerService from using bad stream type" into lmp-dev