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

Change-Id: I934053d546d0363b0da10379f0e2aef5d7dca2f4