Merge "Start hwservicemanager earlier."
am: fcd509298d

Change-Id: I3abfc8e790b57f97503e507702aa184ae9fe0dca