Merge "Fix maximum time to lock" into sc-dev am: 2f9b5b6ad7 am: 8a3372b075
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14109359 Change-Id: Ic701e8397d6441357ecbfad6893803bab66b29d2
This commit is contained in: