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

Change-Id: Ic482a560715c111efcc87f58d5101bb741be798c