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

Change-Id: Id3479f3bc9496707cc362e7e9b1f2e014aa8ea03