Merge "Update for hidlized hwservicemanager." am: 8d0c4ed74c am: 8527f13251 am: 0d5da175a0
am: 630fc8c4f7

Change-Id: Iac8cf0e85a0595dc87d5118b8150888c866262fe