Merge "servicemanager: add dump fd permissions"