Revert^2 "Remove Unused parts of LauncherPrefs causing cyclical dependency."

This reverts commit a80997d9eb21baac4a36eabf5f1b72cdfa0a27e0.

Bug: 324670265
Test: Locally tested this, as well as ran it through post-submit via go/abdt with the fix.
Flag: NA
Reason for revert: Root-caused the issue with this, and will push the fix along with this revert.

Change-Id: I4bda53d94dfdb865883fef6ceec9dacd0b87f015
5 files changed