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

Change-Id: I955d4d487478166f36db27b3b198fb0d995271fe