Merge changes from topic "revert-20334932-revert-20298870-cherrypick-require-screen-on-to-auth-bx2kw8azs3-LDXGTDLPPR-POOWBPUIXB"

* changes:
  Fix keyguard logic for listening to sfps
  Revert^2 "Implement SFPS “require screen on to auth”"