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

Change-Id: Idc856de883500636be54f91d7529a1cc82c7313e