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