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