BnServiceManager -> BnHwServiceManager am: 61ff909c85 am: 72036f8266
am: 3396846f35

Change-Id: If58db842a7d6ba75df60ed1ad6fc3852fe7d2eaa