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

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



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