Merge "Don't animate weight to 0 on face unlock bypass" into sc-dev am: 01feaca6 am: 1e3d2592 am: 4785c644

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

Change-Id: I9bb866e53657ea3475bebaf9c1d55d20b5dbd0c1