Revert "Revert "Wait for hwservicemanager in defaultServiceManager."" am: c1cee2ca2b am: be822c8ff8
am: d25e12faee

Change-Id: Id95dc92594aa6ad1cab1c24d43dbc0689cb73c56