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

Change-Id: I8314346b5ac8cf1f2b219580c02117cd6977e6aa