Avoiding unconditional 5 sec wait in the beginning of inproc tests

Also merging waiting after enabling test provider for the inproc and OOP
cases.

Bug: 311023703
Test: presubmit
Flag: N/A
Change-Id: I417111d984bb0b0d79bada61595e46a6b924ea7c