Merge "Merge "Fix slider being at 0 on unlock" into sc-dev am: 10a6b054 am: c0c36aa8" into sc-v2-dev-plus-aosp am: 63928e1f

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

Change-Id: I4b14c04260767158ca8ec1b7ef19cd1922ea7eea