Merge "Don't animate weight to 0 on face unlock bypass" into sc-dev am: 01feaca6 am: 2d32dfc7 am: cef0cfb6

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

Change-Id: I1896f2e3ec18d4c0b2bcdd5347eba4989bc66012