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: I90fdb42218f9acc5198f191913f68f1d66b5deb1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>