Merge "Add FrameworkStatsLog" am: 7ba0af34c8

Change-Id: Ib6d5362dcde7367361ddaf6c3c27ca9533efa2f9