Merge "Extend getUiAutomation() timeout from 5 seconds to 60 seconds" into udc-dev am: 607cea01

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



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