Merge "Use FrameworkStatsLog instead of StatsLog" am: b3ee8754dd

Change-Id: I6dda8d7f027fdb0b0b0dd589b79d477e23bb8f40