Merge "Revert "hwservicemanager.rc: modify to start earlier.""
am: 66ae7188f0

Change-Id: I2dc08aed4b3a12512861a2516f72047060bbca78