Merge "Check permission to add accessor in servicemanager" into main