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

Change-Id: I23ad38482ce6b7aa9857dccd6398af26b46ee46f