Merge "Hiding StatsCompanionService with @hide"