Merge "Use FrameworkStatsLog in com.android.server.am.*"