Revert "Wait for hwservicemanager in defaultServiceManager." am: ec64c65eed
am: 12202786a6

Change-Id: I1e1e3588c2e5ccd1d40d191cdffa5c71c4e9591e