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

Also reverts ag/16523019.

This reverts commit 08bb56af.

Reason for revert: fix boot time regression

BUG: 211822574
BUG: 211469178
Test: manually followed b/211469178#comment1 and does not reproduce
Change-Id: I1454d83c69319e2ca5801ef75985ed05783f202d