Merge "Cleanup threading in StatsCompanionService" into rvc-dev am: c7a08b57d4 am: f3354efd7e am: 821737088c am: 613a6da7e5

Change-Id: Ia95a9ff6e7998f932a06897fb6f80fa2d6fd9ef9