Merge "Restart audioserver if servicemanager restarts"