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

Change-Id: I9c20959e7fedb2159b2943c5f4fb0ee85194b906