BnServiceManager -> BnHwServiceManager
am: 61ff909c85

Change-Id: I856b1b44a16bc53a6a86c08954a5b52a0ea9ed29