Merge "Test flaky test: Always wait for handle task to complete"

    private void waitForHandlerToComplete(Handler handler, long waitTimeMs)

            throws InterruptedException {

        if (!handler.hasMessagesOrCallbacks()) { // if nothing queued, do not wait.

            return;

        }

        final Object lock = new Object();

        synchronized (lock) {

            handler.post(() -> {