Merge "Update for namespaced services in hwservicemanager." am: 605df82c9e am: 3dcee9882d
am: 1a384933df

Change-Id: I3ab231d9342ec1100866d3da2d752c70793cdcd8