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

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

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



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