Merge "servicemanager: Allow '/' character in service names." into stage-aosp-master am: 053019df21 am: 3ce418e1b5
am: 934b524b95

Change-Id: I58dcd8ddf3a8d7f8aa8cdbc4486b45fb7dc9e794