Update for namespaced services in hwservicemanager.
am: 5fb3d658c5

Change-Id: I0343c7b46c0a1d0ab2dce66ef816903a87d7415f