Merge "servicemanager: Allow '/' character in service names." into...
Merge "servicemanager: Allow '/' character in service names." into stage-aosp-master am: 053019df am: 3ce418e1 am: 934b524b
am: e13b69f2
Change-Id: I0b30212c9179608f14dd5868a5d084b1057ae70e