[automerger skipped] Merge "Implement SFPS “require screen on to auth”" into tm-qpr-dev am: db266ca6b2
am: 4033cc7d0e
-s ours
am skip reason: Merged-In Ia44604b059c4847c40608419b2e16219976ced3e with SHA-1 73bf45ee4b
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20215190
Change-Id: Ia988b3cd1f05732c5a76be35503b11c3c14de84a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: