am 0f7c0570: Merge "Minor cleanup of UsageStatsService"

* commit '0f7c0570e091a284481c2406d8275d87c3786c1d':
  Minor cleanup of UsageStatsService