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

Change-Id: Ifb0e84b892ae5b88acb777f49e6daa19e287a637