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

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

Change-Id: Ibd98914d479d2325fc789def6e2b38c6e5b6e3ca