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

Change-Id: I8a0b5f9d8213907718476daebab4e79a8165e461