Revert "Clean up fully rolled out HeadlessSingleUserFixes"

Revert submission 28993807-hdop-cleaup

Reason for revert: Droidmonitor created revert due to b/363275535. Will be verifying through ABTD before submission.

Reverted changes: /q/submissionid:28993807-hdop-cleaup

Change-Id: I8e1f098abb53ee888be1842d4ad51b3b2ddfc31b
6 files changed