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

Change-Id: Ie53fb18bdc194adeab7ec8e46b11463e633a3afc