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

Change-Id: Ib64d4cbbcf8f0cba4e639da480ae5640d187f62a