Merge "AppIdleHistory: Only write screen on durations during regular sync" into nyc-mr1-dev am: 1af694510d am: 65a12c15e7
am: 3221beabe6

Change-Id: I8c4ee616a81a1d22fa008501e55b563ca04eec35