Merge "Add FrameworkStatsLog" am: 7ba0af34c8 am: e875c95aef

Change-Id: I68008a7236362e958054ce6200c821deea01f678