[automerger skipped] Merge changes from topic "require-screen-on-to-auth" into...

[automerger skipped] Merge changes from topic "require-screen-on-to-auth" into tm-qpr-dev am: 568ad42e am: e570d8b5 -s ours

am skip reason: Merged-In Ic71c82cf9f07fbb3e57039bcff197616b8ddb3cf with SHA-1 494ef026 is already in history

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



Change-Id: Id4694d85601836386afd6e12aa29d20f9b5fe3cc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>