Wait for hwservicemanager in defaultServiceManager.
am: 7aca85aea2

Change-Id: Ic684fe743be1248ff6461c3571b6a8525fa6e415