Merge "Revert "Finalize @SystemApi annotation for StatsFrameworkInitializer""