Wait for hwservicemanager in defaultServiceManager. am: 7aca85aea2
am: 91d50f4ca8

Change-Id: I6384bdfb4559056eb12ef5948e7808b1459f2701