Merge "Revert "Revert "hwservicemanager.rc: modify to start earlier."""