tree 90c7c858d678c5e770e13fee695566c468cdd49c
parent 12913fd3275ea398b700a6f29e6597fbc0b7968d
parent 584df59ac8138e0a92bf45458cba5d5d1552052e
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> 1696271489 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1696271489 +0000

[automerger skipped] Merge "Revert "On device lockdown, always show the keyguard"" into sc-v2-dev am: 584df59ac8 -s ours

am skip reason: Merged-In I9a7c5e1acadabd4484e58573331f98dba895f2a2 with SHA-1 b23c2d5fb6 is already in history. Merged-In was found from reverted change.

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

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

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