Merge "Add Android permissions for audioserver"