[automerger skipped] Merge "Add FrameworkStatsLog" am: 7ba0af34c8 am: e875c95aef am: fd226b766a -s ours
am skip reason: Change-Id I6ba6a67e019a3b5cffd936dad7ce9db6c8c51632 with SHA-1 04ec2529f7 is in history

Change-Id: I24177b2590dd96350a2b698e4988ac6932aa1255