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