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

Change-Id: I508885131eaf1cfb650e51c53c0e19357adc3028