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

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



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