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

Change-Id: I149098cef576114ecd8146f97f81761ec5ab7586