Merge "Allow timeout to be even larger than 1 minute." into udc-mainline-prod am: d5c6c3fc

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Permission/+/24147984



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