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

Change-Id: If478e3fc58a44e69f731bc82f173bf9bd10a5f91