Merge "Verify URI permission for channel sound update from NotificationListenerService" into udc-dev