Merge changes I9c9627ac,I313a7e6d into main

* changes:
  Add udfps_refactor + refactor_keyguard_dismiss_intent to flexi flags
  Replace classic refactor_keyguard_dismiss_intent flag with aconfig flag