Merge "Add configuration for default timeout to dock user" into tm-qpr-dev am: aff1ea79df am: bcce20282a

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

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