Merge "Update for hidlized hwservicemanager." am: 8d0c4ed74c am: 8527f13251
am: 0d5da175a0

Change-Id: I8ed00bc19e120e76e546c2ae0610f8771077a471