Revert^4 "[pm] remove circular dependency in init helper"

This reverts commit 5f075c5b.

Reason for revert: trying to fix this again

BUG: 211822574
Test: verified on flame-userdebug and found no boot time regression
Change-Id: I9df4a1dd74aa660daf5c5b5793f3fd0e9e651752
Merged-In: I9df4a1dd74aa660daf5c5b5793f3fd0e9e651752