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

This reverts commit 251196aed83eec1fc91b2975917541077e61502a.

Reason for revert: another boot time regression
BUG: 217262727
Change-Id: I6b45646557add2cd9500a5cb533b76291270ccaa
5 files changed