Merge "Use FrameworkStatsLog instead of StatsLog" am: b3ee8754dd am: 075b51103e am: ddcb51e926

Change-Id: I0b70f5511b56cf247411a3cea1bc121f1062c158