Merge "AppIdleHistory: Only write screen on durations during regular sync" into nyc-mr1-dev am: 1af694510d
am: 6d90bbbc6c

Change-Id: I11da4168a11265690e27c00498f94eac363e4b64