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

Change-Id: Ide64632d5351a5405f6ab98c09f16311fe71c821