Merge "Revert "wait-for-broadcast-idle before stopUser in UserLifecycleTests.""