Merge "Cleanup threading in StatsCompanionService" into rvc-dev am: c7a08b57d4 am: f3354efd7e

Change-Id: Id63f3902aa544859b91bc40bbd2e0b1527286aba