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

Change-Id: I9fa21a8179ae1ae0ed10a63b8f09aa584f3ca7a0