am 6fb608ee: Merge change 7854 into donut

Merge commit '6fb608ee67c3ad82baf2253b87b63fff8907992a'

* commit '6fb608ee67c3ad82baf2253b87b63fff8907992a':
  Issue #1884058 (Need to only record frequency and duration for selected Google apps)