Merge "Use FrameworkStatsLog instead of StatsLogInternal" into rvc-dev am: 596a1f6f am: 5486a5cc am: 66f37196 Change-Id: Id5b3a3c756578438f174a6e873b1502872c708f6