Merge changes from topic "revert-20691780-cherrypick-modernize_alt_bouncer-2av1xvqe7q-EXOZAWOBTI"

* changes:
  Revert "Modernize alternate bouncer logic"
  Revert "Remove ScrimController from BiometricUnlockController"