Merge "Default to timing out to dock user in 1 minute" into tm-qpr-dev am: 0be191ae

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20683709



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