Merge "Revert "Start hwservicemanager earlier.""
am: 3ba313597d

Change-Id: I6dcce7348c299514573a532f44eaa86b72763613