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

Change-Id: I3fed8151c275000e8d90505620d6183c32b2ea14