Merge "Refactor StatsLogUserEventLogger with SysUiStatsLogBuilder" into tm-qpr-dev