Revert "Move the waiting for the publishing of content provider to client side"

This reverts commit 4dc70f1c.

Reason for revert: Droidcop-triggered revert due to breakage https://android-build.googleplex.com/builds/tests/view?invocationId=I80700005505571712&testResultId=TR62011442642947463&redirect=, bug b/163015685.

Change-Id: If85c6c12e5202b79aa197e2beddd390f8a165f22