Merge "Reset to LiftReveal when going to sleep due to timing out, after a biometric auth." into sc-dev am: 7db2ece5c7 am: 65c089de51

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

Change-Id: I57e276b24afe46b2662c3093d7e6d9c964c23cc8