Merge "Add timeout to waitForBroadcastIdle in UserLifecycleTests." into udc-dev am: 393f7b0e am: 51ad5742

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22849718



Change-Id: I63fed8cfc9e635a6b7353c2e32d58d2ae3dc9173
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>