Merge "servicemanager: Allow '/' character in service names." into stage-aosp-master