Merge "Fix for: timeout and timeout extention for verifiers." into udc-dev am:...

Merge "Fix for: timeout and timeout extention for verifiers." into udc-dev am: 6603db5b am: 24b52aa4

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



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