[automerger skipped] Implement SFPS “require screen on to auth” am: 584c7743be am: 7acebc1828 -s ours
am skip reason: Merged-In I4aa716fb5b288ef6f92a5c403a1fd5e586e889d0 with SHA-1 1eaa038b62 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20215114
Change-Id: I858ea86f496f470ea11ae9f748cceb6d1127db90
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: