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

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

Change-Id: Ifcc1a57614bb540852d8fe2c6593c80b136f7086