Merge "Add audioserver uid and restart service when needed"