Merge "Update for hidlized hwservicemanager." am: 480af3f633 am: 82c67f5662 am: b394786624
am: 0c54c1e8d6

Change-Id: I8a186016e14aa4137233fc97f949b14bac7f19cd