Merge "servicemanager: restrict service name characters" into stage-aosp-master