Merge "servicemanager: remove TODO to combine sid checks"