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