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

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

Change-Id: I3d88eadc5c23f3a8afe602d64ae15d92dd323c06