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

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



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