[automerger skipped] Merge "Extend getUiAutomation() timeout from 5 seconds to...

[automerger skipped] Merge "Extend getUiAutomation() timeout from 5 seconds to 60 seconds" into udc-dev am: 607cea01 am: 1464250e -s ours

am skip reason: Merged-In I192a115b8c67bdf544cf8a5dd9a70b350899cf4e with SHA-1 d7853658 is already in history

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



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