Merge "Use FrameworkStatsLog instead of StatsLogInternal" into rvc-dev am: 596a1f6f am: 5486a5cc am: 101a7874 am: d6cbeae4 Change-Id: If0f40ce117c346fcfac07053ff51db9b59704340