Merge "Update the notification_assistant DeviceConfig namespace."