Merge "Revert "Revert "Start hwservicemanager earlier."""
am: ca622b4e78

Change-Id: I6d08f24f108f84130c059f2515219ebcdbc82b18