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

Change-Id: I1c435b02b39b5783feaeb65df6e6f0e1c5b76a4c