This reverts commit bbcd013c41.
Reason for revert: Increase the boot time to cause the below bug.
b/261027750 | P0 | Broken test: v2/android-perfetto-dev-team/apct/perfetto/perfetto_integrationtests on git_master on oriole_hwasan-userdebug at 9355690
Change-Id: Idba7322ca86e70cf5d8e170936696586caa8c1c2