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

Change-Id: I0d57a9e186fd2f67656a10628afd86b320bae506