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

Change-Id: I7df2786721f5eac5f7c4a431951963277c120b54