Merge "hwservicemanager.rc: modify to start earlier." am: 66ba04f3c8
am: 9520946cd4

Change-Id: I0c909c653ad6002e395a31d3c80c6b5170600bcd