Merge "Revert "Revert "hwservicemanager.rc: modify to start earlier.""" am: 051e91f7a4
am: 622217fabc

Change-Id: I596570892356c96e7cffac05f35a687a58ce4a53