Revert^2 "Add waiting screen before PS setup completion"

This reverts commit d2c91b58.

Reason for revert: Landing the original cl as the test passes locally with changes and failed test looks to be flaky and not related to the change.

Failure is not seen in the ABTD test run results with this CL  b/331935387#comment10

Change-Id: I744e11a04b70e265c5dcfe5aa8db7237561f3a08