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

Change-Id: I7793193dff84a5574bf18d0d0dd84a4e4db769ce