Merge "Merge "Fix slider being at 0 on unlock" into sc-dev am: 10a6b054 am:...

Merge "Merge "Fix slider being at 0 on unlock" into sc-dev am: 10a6b054 am: 2a08fc35" into sc-v2-dev-plus-aosp am: 491a305f

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

Change-Id: Ie04344562a4a7aebce95a2164efb6be8ca1e77b1