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

Change-Id: I9b9249a1a9e31ec7ff477b27e7df5ed9f23b7bfd